Merge "Fix Incorrect lottie status on the beginning of enrolling UDFPS" into udc-dev