Merge "Remove AppWindowTokens from exiting apps with task" into lmp-mr1-dev