[#43120355] Email digest: activity digest layout, refactoring to
separate model & layout
Merge branch 'staging' into production