Resolve "Removing last track in queue jumps player to new last track (instead of continuing current track) (#1485)"