Merge "fix incorrect casting for child color filters" into main