Merge proposals dependent on lp://qastaging/~vthompson/music-app/test_pressing_prev_after_5_seconds

1. test_pressing_prev_after_5_seconds
2. Dependent merge proposals