Settings: Fix the failing strings

Change-Id: I93865d793eef711f8738e00e843e9d4670724c66
Settings: Add option to scramble pin layout when unlocking (1/2).

Change-Id: I3e2c200a0a31d3c765831bc30280029a50c88051
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0-sgt7