Merge "Fix face re-enroll stuck for work profile" into udc-qpr-dev