Merge "[BiometricsV2] Fix 2nd touch not work for enroll" into udc-dev