Merge "Refactor biometric virtual HAL config/control" into main