Merge "For non-udfps, detectFP if primaryAuth required" into tm-qpr-dev