am f527a1d9: Merge "Prevent events from getting backlogged." into honeycomb

* commit 'f527a1d936aea3d531ced39ccc714935a7d02c47':
  Prevent events from getting backlogged.