Merge proposals dependent on lp://qastaging/~tiagosh/unity-2d/bugfix-838708

lp://qastaging/~tiagosh/unity-2d/bugfix-838708 has no merge proposals.