Merge "[Settings] Code refactor for Wifi calling IMS API"