Summary: Windows-only problem fixed by applying 4737679/4623376 fix to navigation keys only.
Reviewed-by: son