Merge proposals dependent on lp:~ahayzen/music-app/fix-1298667

lp:~ahayzen/music-app/fix-1298667 has no merge proposals.