[Finishes #71693868, 71804850] couple step mode fixes
Merge pull request #602 from code-dot-org/stepModeFixes

[Finishes #71693868, 71804850] couple step mode fixes