Merge "Keyguard should authenticate with FP even after getting valid FP" into oc-dev