Merge "Remove voice search handling" into jb-dev