am 8dfda07d: am 731c30c1: Merge "Don\'t add windows from exiting app tokens...
am 8dfda07d: am 731c30c1: Merge "Don\'t add windows from exiting app tokens twice." into klp-modular-dev
* commit '8dfda07d':
Don't add windows from exiting app tokens twice.