Dying while swimming and flying on elytras causes the hitbox to not update after respawning

Summary:
Dying while swimming and flying on elytras causes the hitbox to not update after respawning. After any change to the hitbox (for example, starting to crawl), the hitbox returns to the correct one.

Steps to reproduce (flying):

1. /gamemode s.

2. /replaceitem entity @s slot.armor.chest 1 elytra.

3. /tp ~ ~100 ~.

4. Start flying.

5. /kill @s.

6. Try to get into a space that is 1 block high.

Steps to reproduce (swimming):

1. /gamemode s.

2. Start swimming and swim into a space 1 block high (or hit the top of any block to keep swimming).

3. /kill @s.

4. Try to get into a space that is 1 block high.

Observed results:
You can enter 1 block in space since your hitbox is 1 block high.

Expected results:
After respawning, your hitbox will match the player's state and will be 2 blocks high.

Video:

Original description:
When dying with an elytra on, when the player respawns the hitbox matches the size of the player swimming hitbox, this only goes away when you die while not flying, 1.21.51, win 11.