Merge pull request #16974 from silp-com/mail_was_called

ActionMailer: mark mail as called after instead of before processing it

Conflicts:
	actionmailer/CHANGELOG.md