am 4170b463: Merge "Do not add unsolicited events to queue" into gingerbread

* commit '4170b46329ed91e81cf22dba82e2dadc326b3e3d':
  Do not add unsolicited events to queue