Merge "MediaControlView2: Add UX for ad mode"