Audio shuffle: display play queue un shuffled order

Description

When a play queue is played in shuffle mode, the current behavior is to calculate the next index at the end of a track. The audio queue is also sorted in the order it has been added.

Expected behavior

It would be great to have the queue reflecting the real order, and to allow the user to see the upcoming tracks.

Challenges I see:

The shuffle order has to be calculated before hand
The original order has to be kept in memory in case the user stop shuffling

Screenshot / video

App mode

Smartphone

Auto