Merge "Ensure stale event does not cause ANR" into tm-dev