Merge proposals dependent on lp://qastaging/~vthompson/music-app/change-header-in-now-playing-queue

1. change-header-in-now-playing-queue
2. Dependent merge proposals