Merge "Prevent stale event from being delivered to client" into qt-dev
am: 228bd90c17

Change-Id: I6c27b494ec3d3daba4d3e8c2ae7c0134e29ccd2c