Bug 823783 - Handle various combinations of settings events and wifi events more correctly.
Merge pull request #7435 from mrbkap/823783-settings-tethering-wifi

Bug 823783 - Handle various combinations of settings events and wifi events more correctly, r=kaze