am 27044f1d: Merge "Fix issue #3352125: Crash after clearing search query" into honeycomb

* commit '27044f1d4c5765388a745527b220a3a574c4f834':
  Fix issue #3352125: Crash after clearing search query