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