Merge "Speeding up WifiSettings AP list printout"