Merge "Merge "Destroy saved surfaces if one of the last visible windows gets...

Merge "Merge "Destroy saved surfaces if one of the last visible windows gets removed" into nyc-dev am: 15818e11 am: b56ea680" into nyc-mr1-dev-plus-aosp
am: b1f52d0b

* commit 'b1f52d0b':

Change-Id: I8a148670b8d89e83e8686c862d200a760cc18064