Draft: Bug 40041 04

Matthew Finkelrequested to merge
sysrqb/fenix:bug_40041_04 into tor-browser-81.1.0b1-10.0-1

Closes #40044 (closed) #40041 (closed)

I think it's ready for a first-round of review.

cc @antonela

Edited by Matthew Finkel

Merge request reports