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

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