Merge "Improvements to Settings Preference Service" into main