Merge pull request #23322 from kurund/survey-title-fixes