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

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