Merge proposals dependent on lp://qastaging/~thumper/unity/fix-881106

lp://qastaging/~thumper/unity/fix-881106 has no merge proposals.