Bring hardware key settings inline with cm