Merge "Don't remove all app token windows when window client dies" into nyc-dev