Merge "Unhide MediaControlView2 APIs"