[COMCTL32] Fix regression CORE-14649