Implement the breaking changes in #21828 so that the floating UI upgrade is not a breaking change
Implement the breaking changes in #21828 so that the floating UI upgrade is not a breaking change