Merge proposals dependent on lp://qastaging/~mardy/signon-ui/unused-deps-1608798

lp://qastaging/~mardy/signon-ui/unused-deps-1608798 has no merge proposals.