Merge "Fix pacakge remove callback doesn't be called" into main