Last game mode for game mode switcher and F3 + N is always survival after relogging

The bug

When you rejoin your world, the last game mode that is stored for game mode switcher and and F3 + N always resets to survival after relogging. Even if you are in survival mode after relogging your last game mode counts as survival in game mode, which means that if you open the game mode switcher, the cursor will be at suvival mode even though you are already in survival mode.

To reproduce

1. Switch to survival mode.

2. Relog

3. Open game mode switcher.
   → What happened: The cursor was on survival.
   → What I expected: The cursor will be at the game mode you were before being in survival.

To reproduce this with F3 + N:

1. Switch from creative to spectator.

2. Relog

3. Press F3 + N
   → What happened: You will be put in survival mdoe.
   → What I expected: You will be in creative mode.