Merge "Don't add windows from exiting app tokens twice." into klp-modular-dev