hardware keys rework (1/2)

Change-Id: I16e662a94b1cf8bb44b68339e8392eb0b4e44958