Merge "Retry face auth whenever there is a hardware error" into udc-dev