Merge proposals dependent on lp://qastaging/~compiz-team/compiz-core/compiz-core.fix_873344_873364

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