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

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