Merge proposals dependent on lp://qastaging/~3v1n0/unity/fix-690143-v2

lp://qastaging/~3v1n0/unity/fix-690143-v2 has no merge proposals.