Merge change 6503 into donut

* changes:
  Hide soft keyboard in SearchDialog.dismiss()