Fix save contact search edit process
Merge branch 'MH-616' into dev