Merge proposals dependent on lp://qastaging/~mardy/signon-ui/lp1237496

lp://qastaging/~mardy/signon-ui/lp1237496 has no merge proposals.