Merge "User WifiPickerTracker API for saved network preference text"