Merge "Settings: Rebind to volume sliders after returning from stopped." into lmp-mr1-dev