Resolve #3566969 Refactor Canvas integration to use branches

Closes #3566969

We will need to set minimum version of canvas in composer.json to 1.0.5, but as it is not yet released we might want to do that in another MR. Merging this will unblock tests passing in CI.