Merge "VideoView2: Apply API review comment"