Merge "VideoView2: Move MediaContolView2's hidden constant" into pi-dev