Merge "Biometric auth keyguard adjustments"