Merge "Fix setting crash when removing screenlock with fp" into oc-dev am: 339d117b46
am: c27f924e0e

Change-Id: Ia661bdeafcb3f8beffb5214b4adbb3602e30fca8