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

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