Bug 1837620 - Part 1: Remove baseline ICs that guard shapes when the shape becomes...