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

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