Fix conflict when using field-grid-dropdown with field-colour#2595

berkerozer wants to merge 2 commits intoRaspberryPiFoundation:mainRaspberryPiFoundation/blockly-samples:mainfrom

berkerozer:berkerozer/field-dropdown-registrationberkerozer/blockly-samples:berkerozer/field-dropdown-registrationCopy head branch name to clipboard