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

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