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

* commit 'ca414550d3d431345f4efbee762ea87fe55295af':
  Change method of tracking moving AppWindowTokens.