Merge "Convert from SurfaceTexture to Surface"