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