Merge "Don\'t remove all app token windows when window client dies" into...
Merge "Don\'t remove all app token windows when window client dies" into nyc-dev am: 87a18d9e am: 8066abb0
am: 33f0495e
* commit '33f0495e':
Don't remove all app token windows when window client dies
Change-Id: I4c84f8323e65e0964e0b7a78fde48ce28881e9bf