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

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