Merge proposals dependent on lp://qastaging/~nskaggs/music-app/fix-1379488

lp://qastaging/~nskaggs/music-app/fix-1379488 has no merge proposals.