Bug 43437: Fix base-browser commits after CI code refactor

Merge Info

Issues

Resolves

• #43437 (closed)

Merging

Target Branches

• tor-browser - !fixups to tor-browser-specific commits, new features, security backports
• base-browser and mullvad-browser - !fixups to base-browser-specific commits, new features to be shared with mullvad-browser, and security backports

Backporting

Timeline

• No Backport (preferred): patchset for the next major stable
• Immediate: patchset needed as soon as possible (fixes CVEs, 0-days, etc)
• Next Minor Stable Release: patchset that needs to be verified in nightly before backport
• Eventually: patchset that needs to be verified in alpha before backport

Review

Change Description

Some code was moved in a tor-browser commit that should be in a base-browser commit. The move causes issues when merging base-browser commits, because the code is not in the place where it should be.

This is attempt to fix that.

How Tested

1. This MR should introduce no new changes overall. Just commits.
2. The base browser commits in this MR should apply cleanly to the base-browser branch.