Merge "fix a bug where timeouts would only be handled when a message was delivered" into gingerbread