Merge "Protect against surfaceController and hasSurface getting out of sync." into nyc-dev