Merge "[Settings] Code Refactor - ActiveSubsciptionsListener"