Resolve #40213: Rebase Fenix patches to 99.0

context

• tor-browser-build#40446 (closed)

changes

• Rebase fenix from tor-browser-96.3.0-11.5-1 onto tor-browser-99.0.0b3-11.5-1
• see comments for notes on merge conflicts