Merge proposals dependent on lp://qastaging/~macslow/unity/unity.fix-841750-2

lp://qastaging/~macslow/unity/unity.fix-841750-2 has no merge proposals.