Merge "MediaControlView2: Add UX for Settings"