Merge proposals dependent on lp://qastaging/~cimi/unity-2d/fix-906235

lp://qastaging/~cimi/unity-2d/fix-906235 has no merge proposals.