Merge "Added feature flag for WifiTracker2"