Merge "Use biometric onEnrollmentsChanged callback" into main