Shuffling skips currently selected track

Steps to reproduce

1. add tracks to the queue
2. click the shuffle button

Music does not have to be playing, continuing to shuffle the tracks results in reaching the end of the current queue and no further shuffle activity.

What happens?

When the shuffle button is pressed, all tracks after the current track are shuffled, and focus switches to the next track which results in the first track being skipped.

What is expected?

The entire queue should be shuffled and playback should either start from the beginning of the queue or at least start from same position and shuffle everything including current position and following tracks.

Context

Funkwhale version(s) affected: 0.21.2

Docker all-in-one configuration.