Merge "Migrate to WifiPickerTracker"