That figure in the cmf is actually from half blood prince. yeah i too used to think its from ootp, but its not, I did the research.
HBP: black pockets, rounded seam on shoulder.
Ootp: no shoulder seam, grey pockets.
Anyways they are super similar, so i am expecting maybe Harry and Hermione are reusing their uniforms from their small set.