Bug 41647 & 41453: macro cleanup (base-browser)

Merge Info

Related Issues

• #41647 (closed)
• #41453 (closed)

Backport Timeline

• Immediate - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-day exploit) OR patchsets with trivial changes which do not need testing (e.g. fixes for typos or fixes easily verified in a local developer build)
• 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
• No Backport - patchset for the next major stable

Upstream Merging

• Merge to base-browser - typically for !fixups to patches in the base-browser branch, though sometimes new patches as well
  • NOTE: if your changeset includes patches to both base-browser and tor-browser please please make separate merge requests for each part
  • This is the base-browser MR

Issue Tracking

• Link resolved issues with appropriate Release Prep issue for changelog generation

Change Description

Base Browser counterpart of !568 (merged).

Cherry-picked:

• 8a742c52
• 053d7d63
• 54a69619
• 569b4b96
• c64d13ed
• 9868c314
• aeb28e67
• 8ddac88c
• c69d5035
• e68b2a5c (and squashed to the other mozconfig commit)