Merge "Shorten the search box hint for two-pane layout"