Merge "Fetch WifiManager instance at the time of use" into jb-dev