Merge proposals dependent on lp://staging/~mc-return/compiz/compiz.merge-fix1182794-screenshot-not-compatible-with-unityshell

1. compiz.merge-fix1182794-screenshot-not-compatible-with-unityshell
2. Dependent merge proposals