Merge "Merge "Close leaked windows when trying to preserve main one" into...
Merge "Merge "Close leaked windows when trying to preserve main one" into nyc-dev am: 4ef107bb am: 48164fd5" into nyc-mr1-dev-plus-aosp
am: c3aecdfd
* commit 'c3aecdfd':
Change-Id: I9d3dc488d3a9924984ac63aacc126c485435d29f