Merge "Fix 6299832: Improvements to navbar's "swipe to search""