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: 6c6938fa
* commit '6c6938fa':
Change-Id: I0d518cfba7059b5cb3f86d31de1cd35e0508632a