Merge "Introduce Settings Preference Service" into main