Merge proposals dependent on lp://qastaging/~fboucault/unity-2d/dash_refine_columns_fix

lp://qastaging/~fboucault/unity-2d/dash_refine_columns_fix has no merge proposals.