Bug 873352 - Stop discovering before pairing or connecting
Merge pull request #9835 from eric30/Bug-873352

Bug 873352 - Stop discovering before pairing or connecting