Merge "Fix biometric activities launched twice" into main