Hardware key custom rebinding FIX

Change-Id: Ic656f9c4ee8a88244dc1183b1d7997e3fd5cbde3