Merge "Fix 6398209: Improve responsiveness of swipe up to search" into jb-dev