Rebase 11.0 patches on 91.0b5

Closes #40563 (closed)

I rebased @boklm 's branch from #40461 (comment 2744368) and then I rebased my own branch from tor-browser-90.0-11.0-1 and I got the same results.