Merge "Prevent stale event from being delivered to client" into qt-dev