Merge "Avoid duplication of AppWindowToken in created Task"