Merge "Align DisplayEventReceiver events"