Currently the track that's now playing gets lost when the user hits shuffle. What I think should happen is that the currently playing track stays as item 1 in the playlist and everything around it should shuffle. In this scenario, even if the currently playing track was the last item in the playlist, if a user hits shuffle it should jump to the first slot, stay selected, and the rest of the content gets shuffled.
Currently the track that's now playing gets lost when the user hits shuffle. What I think should happen is that the currently playing track stays as item 1 in the playlist and everything around it should shuffle. In this scenario, even if the currently playing track was the last item in the playlist, if a user hits shuffle it should jump to the first slot, stay selected, and the rest of the content gets shuffled.