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

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