[UX] consistent playback behavior for music and video
Merge pull request #5245 from da-anda/consistent-playback

[UX] consistent playback behavior for music and video