Revert "Don't stick thread IDs in the Intent extra data. Always mark all threads read from notification."

This reverts commit 91b52bed18e4b661eda5659ffa0b16bcaf84329a.