Merge "Fix for IOOB in SearchView" into jb-dev