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

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