Merge "Ensure ICS receives call endpoint change when connected." into main