Merge "Use BiometricPrompt description field for CC description instead"