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

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