Music2: UI + Feature Update
Merge pull request #12715 from es92/music2update3

Music2: UI + Feature Update r=davidflanagan