Merge "Change method of tracking moving AppWindowTokens." into jb-dev