Merge "Update MediaControlView2/Provider"