This is a follow-up work item from #17508. Need to refactor react-accordion to remove use of makeMergePropsCompat.