Merge "Add a hack that ensures face auth failed message is not shown after face lockout" into udc-dev