Merge "Destroy saved surfaces if one of the last visible windows gets removed" into nyc-dev