Merge "String changes to Contacts App (3/3)" into ub-contactsdialer-a-dev