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

* commit '45fe37670abc3d34109d34ee26dd2fb889a5dd4b':
  Fix dead surface/window left on screen

Change-Id: I6de9240fe74354900f2939fde05e25af0b80670f