Bug: Liked Songs - shuffle memory

[GreenScorpion]

When playing through my Liked Songs in order (not on shuffle), and I close and re-open the app (Windows or Android), Spotify has remembered which song I was playing and the point in the song where I left off (good), but it has forgotten that I was not on shuffle (bad).  The Queue is populated with shuffled songs and it behaves as if shuffle is on despite the UI control for shuffle not being toggled on.  

If I try to adjust for this by toggling shuffle on and back off again, it still doesn't reset the Queue to an expected state.

In order to get the Queue back to expected state, I need to play a different song from Liked Songs (then go back to the previously-playing song if I wanted to finish it).

I've only noticed this behavior on Liked Songs; playlists do not exhibit the same behavior (they remember the song/position and the shuffle preference).