Merge "Fix 6299832: Add search target swipe action to navigation bar on phones"