Merge "Fix dead surface/window left on screen" into nyc-dev am: 289395b1fe
am: 31e3b5c065

* commit '31e3b5c065d596b5a1a8d0638183ac737414f913':

Change-Id: I00caf1bea81a1152eaa47c7a3c9e93c6345af61a