Merge "Put latest MediaControlView2/VideoView2 code"