Quickfix of bug with music in launcher.
Merge remote-tracking branch 'origin/master' into launcher_tweakings
Revert "Merge remote-tracking branch 'origin/master' into launcher_tweakings"

This reverts commit bf9d295825f04a3abcc401d9ae33b8592027bc6b, reversing
changes made to a6645ff05bfff91c831e6b78cdfd5054a6ce709c.
Fixed music playback.
Merge remote-tracking branch 'origin/master' into launcher_tweakings