Merge "Close leaked windows when trying to preserve main one" into nyc-dev am:...
Merge "Close leaked windows when trying to preserve main one" into nyc-dev am: 4ef107bb am: 1c4c2caa
am: 49f7135f
* commit '49f7135f':
Close leaked windows when trying to preserve main one
Change-Id: Ic83f1f4a07bed89bf77e96ae16a273c859624948