Merge "Initialize biometric handler only when required" into main