Fixed some of the issues around lost sync between TimeSeries and LegendItems after state load