Resume audio/video playback not updated if history is off

Description

When history is off and "Video/Audio play queue history" is checked, the last resume playback only resumes the last playback that occurred before the settings was changed.

Also the index is not persisted.

Also the progress is not persisted.

Expected behavior

Play queue + index + progress is saved and restored

Steps to reproduce

1. With history ON
2. Play tracks A/B/C
3. In the queue, change the current media to B and go to 1:00
4. Stop
5. Resume playback
6. A/B/C is restored and the player starts playing B at 1:00
7. Disable history
8. Resume playback
9. A/B/C is restored and the player starts playing B at 0:00 (!)
10. Stop
11. Play D/E/F
12. Stop
13. Resume playback
14. A/B/C is restored and the player starts playing B at 0:00 (!!!)

Screenshot / video

Context

App version

current master

Android version

Device model

App mode

Smartphone

TV

Auto