Feature/email trigger changes

This pull request fixes for email design content as well as changes to triggers (rules).

b/17281770
b/17203372 (already fixed)