ConfigPanel : Improve behaviour with secure keyguard

Change-Id: Ia17b43da2657d3d14fef552a363df4e10e12f48a
(cherry picked from commit 1dd589db74472cd3b0ac54c1a786c92b19dbe35c)