Merge proposals dependent on lp://qastaging/~ahayzen/music-app/convergence-tabs-with-sidebar-01

1. convergence-tabs-with-sidebar-01
2. Dependent merge proposals