Merge "Fix missing PreferenceComparisonCallback" into main