Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev