Add choose language in survey mode
Fix conflicts after merging MH-793 to dev