Merge proposals dependent on lp://qastaging/~music-app-dev/music-app/refactor-now-playing-as-sidebar-movable-header

1. refactor-now-playing-as-sidebar-movable-header
2. Dependent merge proposals