Merge "VideoView2: Move MediaControlView2's hidden constants" into pi-dev