Settings: Lock before unlock

Add the setting to gestures menu also - Alex Cruz

Change-Id: I79ad614419e4feed4a19be78e76c62bf54a965e5