Merge "Adding FingerprintEnrollConfirmation" into main