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

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