Fix keyboard mode slightly earlier on upgrade.