Merge proposals dependent on lp://qastaging/~ahayzen/music-app/refactor-prototype-fast-scroll-tracks

1. refactor-prototype-fast-scroll-tracks
2. Dependent merge proposals