Merge "Optimize DisplayRepository to reduce lock contention" into main