Merge "NonBypass - enter device if user is attempting udfps auth" into sc-dev