Merge proposals dependent on lp://qastaging/~compiz-team/compiz-grid-plugin/compiz-grid-plugin.less-eye-burning

1. compiz-grid-plugin.less-eye-burning
2. Dependent merge proposals