Merge "Add new ImsException to better handle ImsService errors"