Clicking song while shuffle is on plays a different song

[benkaiser]

Steps to reproduce:

1. Navigate to Playlists -> Android ->
2. Ensure shuffle is on
3. Press a song to play, notice the song playing is different to the one selected