A draft proposal for #10760 (Integrate TorButton to TorBrowser core to prevent users from disabling it) is attached.
This should already address some review comments in https://trac.torproject.org/projects/tor/ticket/10760#comment:36.
Feedback appreciated!