Rebase tor-browser patches to 84.0b7

5d8149e3 was tagged as 84.0b7