[cherry-pick] Fix two toolbar focus issues

[mollykreis]

Pull Request

📖 Description

Cherry-picking two fixes for toolbar focus issues: a7144c63191e4412d6441cce81cd04cc03152510 b78c921ec4e49ec9d7ec980f079ec114045df42e

🎫 Issues

This pulls in fixes for #6835 and #6819 into the archives branch

👩‍💻 Reviewer Notes

N/A

📑 Test Plan

I ran the changes locally and verified the two bugs are indeed fixed in this branch

✅ Checklist

General

• [x] I have included a change request file using $ yarn change
• [ ] I have added tests for my changes.
• [x] I have tested my changes.
• [ ] I have updated the project documentation to reflect my changes.
• [x] I have read the CONTRIBUTING documentation and followed the standards for this project.

Component-specific

• [ ] I have added a new component
• [x] I have modified an existing component
• [ ] I have updated the definition file
• [ ] I have updated the configuration file

⏭ Next Steps

N/A

[mollykreis]

@chrisdholt, do we need to wait for any other reviewers on this cherry-pick PR?

[chrisdholt]

@chrisdholt, do we need to wait for any other reviewers on this cherry-pick PR?

No, but I'd like to ensure the build passes...not sure why it isn't running though. I'll pull down locally and test and if it doesn't fire we can move it right through.