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

* commit '8dfda07dd410c1776c6b0d373229fe77c76f8cfc':
  Don't add windows from exiting app tokens twice.