chore: Sync main with release

[jimblanc]

Description of changes

PR prepared with commands:

git checkout main
git checkout -b fix/release-branch-sync
git merge --no-ff release

This change will be merged as a merge commit and should synchronize our branches with the last aborted release.

Issue #, if available

Description of how you validated changes

Checklist

• PR description included
• yarn test passes
• Tests are changed or added
• Relevant documentation is changed or added (and PR referenced)

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

[codecov-commenter]

Codecov Report

Merging #11765 (47f4641) into main (57127c5) will not change coverage.
The diff coverage is n/a.

❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more.

@@           Coverage Diff           @@
##             main   #11765   +/-   ##
=======================================
  Coverage   84.03%   84.03%           
=======================================
  Files         348      348           
  Lines       21037    21037           
  Branches     4445     4445           
=======================================
  Hits        17678    17678           
  Misses       3098     3098           
  Partials      261      261           

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more