Merge "Don't listen for FP device entry if biometric prompt is showing" into main