The spec has been updated so that floats with shape-outside are now positioned using the margin box of the float, same as if they didn't have shape-outside.
This is done.