Merge pull request #8761 from Sintendo/fixquirk Analytics: Report correct quirk for mismatched xf/bp colors
