Merge "Fix 6397736: Swipe up to search layout fixes" into jb-dev