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

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