am 98e333f: Fix back key and ime behavior for search dialog.

Merge commit '98e333f551a4bf2ebb50bb97a2a56b14bfdcd74b'

* commit '98e333f551a4bf2ebb50bb97a2a56b14bfdcd74b':
  Fix back key and ime behavior for search dialog.