Draft: Remaining part of 28745 (THE Torbutton clean-up)
I cherry picked the last remaining commit from #28745 (closed) (acat/torbutton@0a3ec494) and fixed the conflicts (many changes were already included in !27 (merged)).
I cherry picked the last remaining commit from #28745 (closed) (acat/torbutton@0a3ec494) and fixed the conflicts (many changes were already included in !27 (merged)).