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: b21e2dd9
* commit 'b21e2dd9':
Change-Id: Ia3a4fd89fe1fb240dcc744cdc8c91841eee06c9e