cleanup hardkey disabling

Change-Id: Ic9ba60862e74d8c71718f3cdcf67b663cc649ca8