Merge proposals dependent on lp:~vthompson/music-app/fix-1293488

lp:~vthompson/music-app/fix-1293488 has no merge proposals.