Merge proposals dependent on lp://qastaging/~sil2100/compiz/change_scale_keybinding

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