am d5b6b4b7: Merge change 7903 into donut

Merge commit 'd5b6b4b75ef928d02e0d728bebbfe543cae154bc'

* commit 'd5b6b4b75ef928d02e0d728bebbfe543cae154bc':
  Fix back key handling for search dialog.