Merge proposals dependent on lp://qastaging/~azzar1/unity/fix-977922

lp://qastaging/~azzar1/unity/fix-977922 has no merge proposals.