Merge change 27474 into eclair

* changes:
  Don't crash search when getKeyDispatcherState() is null