Merge "Type of search on headset key long press must depend on device state" into jb-dev