Merge proposals dependent on lp://qastaging/~bregma/compiz/refactor-main

lp://qastaging/~bregma/compiz/refactor-main has no merge proposals.