BB/TB 43584: Rebased stable again onto 128.9.0esr build2

Merge Info

Rebase Issue

• #43584 (closed)
• mullvad-browser#xxxxx

Release Prep Issue

• tor-browser-build#xxxxx

Issue Tracking

• Link rebase issue with appropriate Release Prep issue for changelog generation

Review

Request Reviewer

• Request review from a release engineer: boklm, dan, ma1, morgan, pierov

Change Description

Also changed the survey commit back to be a fixup to the about:tor commit.