Merge "Update hint action for canceling face auth in BP" into udc-d1-dev