Merge "Prevent events from getting backlogged." into honeycomb