Merge "Fix UnlockedDeviceRequired with biometric unlock with unified challenge" into main