Changes for custom hardware key bindings
Merge branch 'hardware_keys' into jb-mr1.1-release