Merge "Update udfps states on enrollment changes" into sc-v2-dev