Issue #3316499 by jcnventura: Refactor the TfaContext into a trait, rename the TfaDataTrait to TfaUserDataTrait