Merge "Don't use DISPLAY_NAME for chips if name is email or phone" into jb-dev