Add locate contact feature
Fix conflicts after merging MH-452 to dev