Merge "Fix biometric prompt appearing above shade" into main