Merge "Fix Wifi Signal strength icon issues in WifiSettings." into mnc-dev