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

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