Merge "Fix for search view/IME issues"