Merge "Fine tune search history UX and a11y"