Merge change 7903 into donut

* changes:
  Fix back key handling for search dialog.