react-spectrum

Revert reverts from before latest release

#6926

Merged