Merge proposals dependent on lp://qastaging/~smspillaz/compiz-core/compiz-core.decor_sync_996901

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