Merge pull request #5348 from astifter/use_h3_for_showing_contacts