am 67e6070f: Merge "Change method of tracking moving AppWindowTokens." into jb-dev

* commit '67e6070fa10bbd313c8ebe0de4e0440b688c569e':
  Change method of tracking moving AppWindowTokens.