[sgen] Fix Thread layout after changes in #3123