Merge pull request #18602 from jimporter/music-update-hidden-scrubber

Bug 1000214 - [music] Update progress bar when display is suspended and ...
Conflicts:
	apps/music/test/marionette/Player_test.js