Similar to D11749, but for ThreadMenu

Depends on D11749

flow + close reading.

Will test generally at end to make sure things work as expected. Don't think it's practical to manually test each of these trivial changes.