Merge "Fix voice search mode"