Merge "Saved network summary string fixes in Wifi Settings" into mnc-dev