Merge "Define Settings Preference Service API data models" into main