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

* commit '4cfd54eaf0106373e1fea75a1e33ac460cf7c23d':
  Don't add windows from exiting app tokens twice.