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

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

Change-Id: Idd818246a5ada66abc24806529848d8d25a2e383