Merge change 22023 into eclair-dev

* changes:
  Fixing the Split contact UI