Merge "Unhide VideoView2 APIs"