Couple changes based on existing pull requests:
 - prevent last line/bar from staying on chart if disabled in legend
 - rearranged wrapper layer order so it's now stacked, then bar, then line