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

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