Merge proposals dependent on lp://staging/~mc-return/compiz/compiz.merge-fix1048505-firepaint-does-not-paint-fire

1. compiz.merge-fix1048505-firepaint-does-not-paint-fire
2. Dependent merge proposals