Merge proposals dependent on lp://staging/~ahayzen/music-app/refactor-pull-now-playing-sidebar

1. refactor-pull-now-playing-sidebar
2. Dependent merge proposals