Merge branch 'main' into additional-shadow-dom-tests
# Conflicts:
# packages/@react-aria/combobox/package.json
# packages/@react-spectrum/s2/stories/ComboBox.stories.tsx
# packages/@react-spectrum/s2/test/Combobox.test.tsx
# packages/react-aria-components/test/Popover.test.js
# packages/react-aria/src/combobox/useComboBox.ts
# packages/react-aria/src/interactions/utils.ts
# packages/react-aria/test/focus/FocusScope.test.js
# packages/react-aria/test/interactions/useInteractOutside.test.js
# packages/react-aria/test/overlays/useOverlay.test.js
# packages/react-aria/test/overlays/usePopover.test.tsx
# yarn.lock