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

* commit '69481d54c2c6da6ec931bb7435bddf7be1aba0af':
  Don't add windows from exiting app tokens twice.