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

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