Merge "Protect against surfaceController and hasSurface getting out of sync."...
Merge "Protect against surfaceController and hasSurface getting out of sync." into nyc-dev am: ea3aa1bc
am: 6cc114ea
* commit '6cc114ea':
Protect against surfaceController and hasSurface getting out of sync.