Merge "Shorten the search box hint for two-pane layout" into tm-qpr-dev