Merge "Migrate STLImpl to ApproachLayoutModifierNode" into main