Revert key hack && restore hw key overlay