Merge "Fix getConfiguredNetworks when wifi is disabled" into jb-dev