Merge "Revert "Add shortcut for voice search"" into jb-dev