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