Settings: Lock before unlock the new way (2/2)

for more information see fb commit

Change-Id: I6bb41539383c2b02b62354b00c773505f396028e