[Android][Playlists] Better shuffle

[F3110w831ng]

The shuffle seems to only work effectively with less than 100 songs. I have over 600 songs on my liked playlist, and I can hear the same song twice in a day. 

Thanks for your help!