A4

Merge proposals dependent on lp://staging/~daniele-de-luca/a4/cairo-controls-test

lp://staging/~daniele-de-luca/a4/cairo-controls-test has no merge proposals.