Backport 1760674

https://bugzilla.mozilla.org/show_bug.cgi?id=1760674 won't be uplifted to ESR (I don't think) but it should be backported for Tor Browser.