Merge "Split SupplicantStateTracker and refactor"