Code review comment for lp://staging/~mc-return/compiz/compiz.merge-fix1173914-low-res-non-power-of-2-icon-texture-res

1. compiz.merge-fix1173914-low-res-non-power-of-2-icon-texture-res
2. Merge into 0.9.10