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

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