Merge proposals dependent on lp://qastaging/~fhd/unity-2d/fix-for-bug-795422

lp://qastaging/~fhd/unity-2d/fix-for-bug-795422 has no merge proposals.