Merge "Remove unnecessary field from AppWindowToken."