Merge "MediaControlView2: Final Settings UX addition" into pi-dev