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

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