Merge proposals dependent on lp://qastaging/~vanvugt/compiz/fix-1021104

lp://qastaging/~vanvugt/compiz/fix-1021104 has no merge proposals.