Saving and quitting while swimming causes the player to stand up even when they should not be able to

Identical to MC-132482 in cause, however results differ.

If you swim into a one block high space, then save and quit, when you log back in, you will have teleported to the nearest available space above where you logged out. One would expect to have logged back in to remain in a swimming state in the same location.