Merge "fix a small race condition when returning the default width/height of a SurfaceTexture"