Merge "Fix scrim attachment and detachment issues." into main