Support toolbar with concreteBlocks
Merge pull request #62 from code-dot-org/jigsaw

[Finishes #69033760] Support toolbar with concreteBlocks