Merge commit '385a39d322267890edc0708c1baff7ac4125ed31' * commit '385a39d322267890edc0708c1baff7ac4125ed31': Don't crash search when getKeyDispatcherState() is null
Merge commit '385a39d322267890edc0708c1baff7ac4125ed31' * commit '385a39d322267890edc0708c1baff7ac4125ed31': Don't crash search when getKeyDispatcherState() is null