Merge "Don't show udfps disabled after biometric auth" into sc-dev