Merge "Properly cache color state lists."