Merge proposals dependent on lp://qastaging/~alan-griffiths/compiz-core/stop-dumping-windows-in-first-workspace

1. stop-dumping-windows-in-first-workspace
2. Dependent merge proposals