Merge "2/n: Add UserAwareBiometricScheduler" into sc-dev