Merge proposals dependent on lp://qastaging/~music-app-dev/music-app/prototype-now-playing-side-panel

1. prototype-now-playing-side-panel
2. Dependent merge proposals