Merge proposals dependent on lp://staging/~smspillaz/compiz-core/compiz-core.maybe_fix_931473

1. compiz-core.maybe_fix_931473
2. Dependent merge proposals