Merge "Fix Biometric Prompt with different display sizes" into main