Merge "[Catalyst] Support Getter API for settings service" into main