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

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