Personally, I don't think CS should be a core subject in primary schools. I think it'd be better to have some kind of technology competency subject, to help teach basic use, problem solving, security and privacy practices, and whatnot. A bit of programming and the core concepts of logical thinking and algorithms wouldn't be a bad idea, but I think most students wouldn't actually need to know CS.
If they want to address job demand, I feel it'd be better to increase teacher pay to get better CS teachers, so there'd be a few _good_ CS graduates, rather than many _average_ CS grads.