Merge "Remap SEARCH key to ASSIST." into jb-dev