Merge "Move tracking booleans to ShadeRepository" into main