Merge "Fix uninitialized variable in SurfaceTexture"