Merge "Avoid saving contact when user doesn't intend to do so." into ub-contactsdialer-a-dev