Merge "Use different prompt messages for biometric|credential" into sc-dev