Merge Allow hardware overflow key to be show by default. into cm-10.1

Change-Id: I440ad6161b721a4fb945868bd4c2c601c198fed7