Merge "Fix TK configuration to the driver in EAPOL-Key 3/4 retry case"