Merge "MediaControlView2: Hide API for customization"