Merge "VideoView2Impl: Apply API changes"