Implementation of #9502
The new keybindings shouldn't mess with existing bindings anymore
Also gave the new actions more meaningful names