Flying down doesn't cancel flight mode

Steps to Reproduce on Windows PC:

1. Enter flight mode
2. Fly down with 'SHIFT' until you touch the ground
3. Press 'W' to go forward

Observed Results:
Player doesn't exit flight mode upon touching the ground and sometimes starts walking for a small distance while touching the ground in flight mode.

Expected Results:
Player should exit flight mode upon touching the ground.