Merge "Correct the deferred sending of display events." into main