Merge "email: prevent stock email app to unset firstSnippet on mark/unmark as read"