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