Swimming causes incorrect block selection offset

When swimming, the block that is hovered over by the crosshair is not selected correctly for a split second (as the animation adjusts camera height to the correct location).

Video documentation of bug: https://youtu.be/NERwvay8iCk

What's happening in the video: I actively am hovering my crosshair over the gravel in front of me, but when I swim forward, a block below me is incorrectly selected.