Merge proposals dependent on lp://staging/~sjakthol/compiz/fix-878516

lp://staging/~sjakthol/compiz/fix-878516 has no merge proposals.