Merge "Per-user fingerprint lockout"