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

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