am: 6cc114ea96
* commit '6cc114ea96b7cdfdb2cae6350bd214ef7fe9d7ce':
Protect against surfaceController and hasSurface getting out of sync.
am: 6cc114ea96
* commit '6cc114ea96b7cdfdb2cae6350bd214ef7fe9d7ce':
Protect against surfaceController and hasSurface getting out of sync.