Merge pull request #14353 from eric30/Bug-945631

Bug 945631 - Listen to event discoverystatechanged, r=arthurcc