Merge "[Catalyst] Add PreferenceCategory metadata" into main