Merge "EmailNotification: Add newline before minor edit text"