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

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