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

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