Merge "Further reduce memory usage of notification archive." into jb-mr2-dev