Merge "Don't hide types when associated label is empty" into ub-contactsdialer-a-dev