Merge "MediaControlView2: Add Music UX" into pi-dev