Merge "Fix up color generation in gecko_profile_generation" into main