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