am edb90569: am 19d985fd: Group non-phone and email fields together on compact editor

* commit 'edb905691c1e23ac9cbbd2c8e533c36072159fd1':
  Group non-phone and email fields together on compact editor