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