Merge "Fix NPE when joining contacts on the phone"