Upgrade keybinding resolver to fix deprecation warnings in specs