Merge "Lazy load BiometricUnlockController" into rvc-dev