[CLC-922] Split up canvas upcoming more evenly between next week and this week