restore previous code to hardware key improvement

For some reason this was removed. Without this patch the hardware key toggle for the
navbar would sometimes fire blanks and nothing would happen.

Change-Id: Ieaf703cf4bd99e8d35f1c086c4f41715d8ce73de