Merge "Protect add connections in CdmaConferenceController by a synchronized pending set." into sc-dev