Bug 974048 - Refine waits when connecting to a WiFi network
Merge pull request #16420 from zacc/bug_974048

Bug 974048 - Refine waits when connecting to a WiFi network