favoring the vclcanvas one for the places where
they diverge

Change-Id: I18e3d4e7659ebd4cb90c86718c1b1035671b4be3