Merge "Minor fix in SurfaceTexture"