Merge "Enable biometric virtual sensors separately" into main