Merge "Migrate AppWindowToken lists into DisplayContent."