Merge "[DO NOT MERGE] Remove duplicate face re-enroll notification" into udc-qpr-dev