Merge change Ibcade31c into eclair

* changes:
  [Issue 2147295] Only showing visible contacts in contact Join UI