Merge "[BiometricsV2] Fix end-to-end enroll test fail" into main