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

* commit '289395b1feca65fc758384bb2d5c12f1c78500c1':
  Fix dead surface/window left on screen

Change-Id: Id35fbc3822975ca16d8134f780f81ad09efdf2b5