Merge proposals dependent on lp://staging/~ci-train-bot/indicator-session/indicator-session-ubuntu-disco-3643

1. indicator-session-ubuntu-disco-3643
2. Dependent merge proposals