am 8b8a8f65: am a7c76d83: Merge "fix a bug where timeouts would only be handled when a message was delivered" into gingerbread

Merge commit '8b8a8f65b5306aa557028feba7317470222a73df'

* commit '8b8a8f65b5306aa557028feba7317470222a73df':
  fix a bug where timeouts would only be handled when a message was delivered