Merge "Fix to handle duplicate call id for conference call"