Merge "Close leaked windows when trying to preserve main one" into nyc-dev
am: 4ef107bb7a

* commit '4ef107bb7ad0c1f28db710374bb118e6658d3238':
  Close leaked windows when trying to preserve main one

Change-Id: I20b5d6ab8adbb97cffca52e1daf66ed939d508b8