Merge "Fix ShadeCarrierGroup being initialized appearing left-aligned" into main