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