Merge "Do not add unsolicited events to queue" into gingerbread