Merge "[contextualsearch] wire new feature into build" into main