Merge "Remove unnecessary glop color storage"