Merge "Fixing: search button and mic button are not right-aligned"