Merge "Added more robust tracking and cancelation of events." into gingerbread