Merge proposals dependent on lp://staging/~mardy/signon/rtm-fixes

lp://staging/~mardy/signon/rtm-fixes has no merge proposals.