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

* commit '31e3b5c065d596b5a1a8d0638183ac737414f913':
  Fix dead surface/window left on screen

Change-Id: I46664a5f9ca48557fab650385409e445267b109d