Merge "Move biometric errorMsg supression to its own helper class" into udc-qpr-dev