Merge "Move ImsResolver to a singleton pattern"