Merge "WifiTrafficPoller: Replace ExternalCallbackTracker" into sc-dev