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

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