Merge "Accumulate updates to notifications before archiving." into jb-mr2-dev