ConfigPanel : Improve behaviour with secure keyguard

Change-Id: Ia17b43da2657d3d14fef552a363df4e10e12f48a
Merge branch 'cm-11.0' into kk_mkt