Merge "VideoView2: Handles viewType attribute" into pi-dev