Merge proposals dependent on lp://staging/~cjcurran/indicator-session/various-fixes

lp://staging/~cjcurran/indicator-session/various-fixes has no merge proposals.