Upgrade keyboard-layout for non-mac platform fixes