Merge "Use the terms "Link and Unlink" instead of "Merge and separate"." into ub-contactsdialer-a-dev