Merge "Make surfaceRedrawNeeded forgiving" into nyc-dev