Revert "Revert "HW keys config bool""

This reverts commit ceb6e14ba0a4a12775854470f41161d7bc0d9e65.