Resolve PR 89 merge conflicts and preserve toolbar step titles#225

seveibar merged 2 commits into

maintscircuit/graphics-debug:mainfrom

codex/fix-pr-89-conflictstscircuit/graphics-debug:codex/fix-pr-89-conflictsCopy head branch name to clipboard