Merge "Move ImsResolver to a singleton pattern" into sc-dev