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

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