bring back options for hardware buttons

Change-Id: Ie5498e6097ca357336e77a773860d6574048abce