Merge "Fix setting crash when removing screenlock with fp" into oc-dev