Merge proposals dependent on lp://staging/~mc-return/compiz/compiz.merge-fix1101405-src-screen.cpp-cleanup

1. compiz.merge-fix1101405-src-screen.cpp-cleanup
2. Dependent merge proposals