Merge "Fix persisting wifi state on setWifiEnabled() call" into jb-dev