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

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