Merge "VideoView2: switch to using getVideoSize"