Squashed 4.3 commits for custom hardware key bindings
sort key presses out