Merge "Make search tests not flaky" into rvc-dev