Merge "Nuke heavy parts of notification before archiving." into jb-mr2-dev