Merge "Archive a copy of each dismissed notification." into jb-mr2-dev