Bug 823783 - Handle various combinations of settings events and wifi eve...

...nts more correctly.