am dea29b7d: Merge "Fix showing all phone nums and emails for joined contacts" into mnc-dev

* commit 'dea29b7d5cb6200ae57d23bd5449b9620338d8d8':
  Fix showing all phone nums and emails for joined contacts