Merge "WifiSettings cleanup; emptyListi() instead of null"