Merge "Merge "Fix dead surface/window left on screen" into nyc-dev am:...
Merge "Merge "Fix dead surface/window left on screen" into nyc-dev am: 289395b1 am: 31e3b5c0" into nyc-mr1-dev-plus-aosp
am: 7e0be66c
* commit '7e0be66c':
Change-Id: I97b47136298db48fd686e802a66dc5523531d382