Merge "[Catalyst] Fix calling pid/uid in PreferenceService" into main