recordonly commit to fix earlier merge without -x
* make an excpetion and allow undocumented TD_QUESTION_ICON constant. There are multiple sources for this. Fixes #40406

(cherry picked from commit 6ab91262b2e58c5b1bbea8842e5654e160c7a758)