This 100 %.
I watch a show for entertainment, not to be preached at. Disney is the same, there was one scene in which Captain America goes to a bank and is denied a loan because he is black. That kind of messaging is unnecessary in that kind of show.