Differential Revision: https://phabricator.services.mozilla.com/D95046 Depends on D95045
mozilla-central