Merge "Fix UDFPS enrollment shadow" into sc-dev