Merge proposals dependent on lp:~glmark2-dev/glmark2/canvas-reset

lp:~glmark2-dev/glmark2/canvas-reset has no merge proposals.