Merge proposals dependent on lp://qastaging/~vthompson/music-app/prototype-page-head-sections

1. prototype-page-head-sections
2. Dependent merge proposals