Merge change 24599 into eclair

* changes:
  [Issue 2112887] Fixing picture display in the manual contact join UI