Merge "MediaControlView2: Add Additional UX for Settings"