Merge pull request #14395 from arthurnn/fix_mailer_preview_test

Fix MailerPreview broken tests