Merge "Send valid displayId and eventTime for edge back event"