Latest changes to ChartWindow. Finishes fix for #78847 and fixes part of #78926.