Merge proposals dependent on lp://qastaging/~vthompson/music-app/music-uc1.3-now-playing-fix-1447428

1. music-uc1.3-now-playing-fix-1447428
2. Dependent merge proposals