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

Change-Id: I31cbd7d7242b5cb84ac1fe5912a3dfddbc86d07e