Merge change 8773 into donut

* changes:
  Only dismiss search on suggestion click in in-app search