Merge "Fix dead surface/window left on screen" into nyc-dev