Merge "MediaControlView2Impl: Apply API changes"