Merge change I1172406d into eclair

* changes:
  Moving contact split functionality to contact Edit