Merge "VideoViewTest: only use public APIs" into pi-dev