This is a follow-up work item from #17508. Need to refactor react-provider, react-theme-provider, and react-focus-management to remove use of makeMergePropsCompat.