Moving through player-damaging blocks in Spectator mode and changing game mode to survival/adventure after moving away damages the player

Related to MC-279016, MC-279021, MC-279032 and MC-279033.

Moving through blocks that damage the player (sweet berry bushes, fire & soul fire, campfire & soul campfire, lava) while in spectator mode, and then changing the gamemode to survival or adventure damages the player.

 

Steps to Reproduce:

1. While in spectator mode, fly through a player-damaging block (e.g. sweet berry bush).
2. Change the player's game mode to survival or adventure.

Observed Results:

The player takes damage, despite leaving the block while in spectator mode.

Expected Results:

The player does not take damage, as the player never touched the block while in survival or adventure mode.