Merge "Enable biometric virtual sensors separately" into 24D1-dev