Merge "Merge "Fix dead surface/window left on screen" into nyc-dev am: 289395b1fe am: 31e3b5c065" into nyc-mr1-dev-plus-aosp
am: 7e0be66c42

* commit '7e0be66c428eb12e93ce026efbd8330523e6b0e0':

Change-Id: I97b47136298db48fd686e802a66dc5523531d382