Bug 942744 - Stop discovering before connecting
Merge pull request #14004 from eric30/Bug-942744

Bug 942744 - Stop discovering before connecting, r=evelyn