Uncomment music player.
Merge branch 'music-player'