Merge "Fix flaky important people sort test" into rvc-dev