Merge proposals dependent on lp://staging/~ian-mcintosh/luz/cairo-canvas-to-framebuffer-canvas

1. cairo-canvas-to-framebuffer-canvas
2. Dependent merge proposals