Merge "Fix duplicate SSID entries in the WifiSettings UI" into klp-dev