Merge "[WifiSetup] Add + icon to Add another network" into mnc-dev