Merge change 23667 into eclair

* changes:
  Fix the -1 unread count bug.