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

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