Merge pull request #8169 from lodr/bug-841321-wifi-reset

Bug 841321 - Moving wifi fixing as global option since Wi-Fi is not SIM specific
Cause r+(cherry picked from commit 6f774ab713a564aa8469d34f2e4aeff7df9da030)