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

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