chore: Merge branch master into rc/v12.0.0#2511

BenHenning merged 37 commits into

RaspberryPiFoundation:rc/v12.0.0RaspberryPiFoundation/blockly-samples:rc/v12.0.0from

BenHenning:master-with-conflict-resolutionBenHenning/blockly-samples:master-with-conflict-resolutionCopy head branch name to clipboard