Merge "[Catalyst] Remove PreferenceMetadata usages" into main