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