Merge "Fixed disconnect bug in SurfaceTexture"