Merge proposals dependent on lp://qastaging/~ahayzen/music-app/refactor-adaptive-page-layout

1. refactor-adaptive-page-layout
2. Dependent merge proposals