Merge proposals dependent on lp:~vthompson/music-app/fixes-1248993

lp:~vthompson/music-app/fixes-1248993 has no merge proposals.