Merge "Experimental support for changing the video surface/texture on an active mediaplayer"