Merge "Make WifiTracker lifecycle aware"