Merge "Close leaked windows when trying to preserve main one" into nyc-dev