Merge "Revert "[Settings] Code Refactor - ActiveSubscip..."" into sc-dev