Merge proposals dependent on lp://qastaging/~sil2100/compiz/revert_3427_0.9.8

lp://qastaging/~sil2100/compiz/revert_3427_0.9.8 has no merge proposals.