Merge "[DO NOT MERGE] Contacts to display UI improvements (2/2)" into ub-contactsdialer-f-dev