Merge "Update biometric message to allow identifying special messages like auth failure and auth lockout." into main