Update #1313 for MV3

[jdorweiler]

Reviewer:

Description:

Updating #1313 for Chrome MV3

Steps to test this PR:

Automated tests:

• Unit tests
• Integration tests

Reviewer Checklist:

• Ensure the PR solves the problem
• Review every line of code
• Ensure the PR does no harm by testing the changes thoroughly
• Get help if you're uncomfortable with any of the above!
• Determine if there are any quick wins that improve the implementation

PR Author Checklist:

• Get advice or leverage existing code
• Agree on technical approach with reviewer (if the changes are nuanced)
• Ensure that there is a testing strategy (and documented non-automated tests)
• Ensure there is a documented monitoring strategy (if necessary)
• Consider systems implications

[jonathanKingston]

LGTM; didn't test here but we can verify later. The code itself is looking very solid now thanks for all your work!

will make followups