Merge "Show delete button only when text is not empty" into ub-contactsdialer-a-dev