Bug 40082 v2

Georg Koppenrequested to merge
gk/torbutton:bug_40082_v2 into master

Closes #21601 (closed), tor-browser#40082 (closed).

Edited by Georg Koppen

Merge request reports