Merge "Update active group when showing BiometricPrompt"