Merge "Add temp value for BiometricEnrolled.template_id" into main