Merge "Fix search bar layout in RTL mode"