Merge "Mark DisplayHashManagerTest test as flaky" into main