Merge "Fix race in DisplayRepository tests" into main