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

* commit '786302f2fa658740b1819bc53e3ca3e3f2b4e01e':
  Fix dead surface/window left on screen

Change-Id: Ibba49102dbd1bdfe7aba4b5cf022b3c3c0098e9a