Merge proposals dependent on lp://qastaging/~vanvugt/unity/fix-687567-unity4

lp://qastaging/~vanvugt/unity/fix-687567-unity4 has no merge proposals.