am 83056011: Merge "Can add mulitple email and phones on compact editor again" into mnc-dev

* commit '83056011c9c529546e6a98817dee3be04423b3b9':
  Can add mulitple email and phones on compact editor again