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

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