Merge "Revert "[Catalyst] Support settings service"" into main