Merge change 24683 into eclair

* changes:
  Tell GlobalSearch about searches without a suggestion