Merge "Fix ImsService Callback synchronization issues"