Merge "Add biometric enrollment support for private profile" into main