Merge "Eliminate groupId and add task to AppWindowToken"