Squashed 4.3 commits for custom hardware key bindings

Change-Id: I1183efc99932c2f1ac090c94e0ab49701eea38a9