Merge "Fix NullPointerException in Contact Editor." into ub-contactsdialer-a-dev