Merge proposals dependent on lp://qastaging/~smspillaz/unity/unity.fix_835259

lp://qastaging/~smspillaz/unity/unity.fix_835259 has no merge proposals.