Merge "LightBarController: directly inject BiometricUnlockController" into main