Merge "Fix STLImpl scene update" into main