Yes. For the callable/putable bonds, you’re correct when the options aren’t far out of the money. When they’re far out of the money, their duration & convexity are nearly identical to those of straight bonds.
The original exhibit in the 2022 curriculum had half of the convexities wrong. Rather than correct them, they simply removed all of them (the correct and the incorrect ones).