Merge "setVideoSurfaceTexture is now synchronous and applied dynamically"