Merge "[Settings] Code refactor for IMS part"