Merge proposals dependent on lp://staging/~mardy/signon-ui/lp1171853

lp://staging/~mardy/signon-ui/lp1171853 has no merge proposals.