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

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