ConfigPanel : Improve behaviour with secure keyguard

Change-Id: Ia17b43da2657d3d14fef552a363df4e10e12f48a
Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Conflicts:
	configpanel/src/com/cyanogenmod/settings/device/KeyHandler.java

Change-Id: Ied8927340a70372748463d1c9088a134487ee1ac