Fix edit surveys in profile page
Merge branch 'MH-1030' into dev