Merge "[BiometricsV2] Fix intro overlap enrolling page"