Merge "Fix delete face button disappear after reenroll" into udc-d1-dev