The late-night comic's show will return to air after Disney said it had "thoughtful coversations" with him.