Merge "Music: Update progress bar in screen on state"