Merge "VideoView2: Initial integrated version with MediaPlayer2" into pi-dev