Merge "Change the search UI on 2-pane"