Merge proposals dependent on lp://qastaging/~vthompson/music-app/lighter-now-playing-toolbar

1. lighter-now-playing-toolbar
2. Dependent merge proposals