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

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