Cleanup hardware buttons settings

Change-Id: I2301322ce138cb9b8868cf19bcdbb6c8455ac6c2