Merge "Replaced use of AppWindowToken.allAppWindows with WindowToken.windows"