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

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