Fix Home/Menu/Back keys' unlock

Change-Id: Id2bf457261619f64cf8717e2f18cf9775159921a
Merge "Fix Home/Menu/Back keys' unlock" into cm-10.1
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1