Merge proposals dependent on lp://qastaging/~ci-train-bot/indicator-session/indicator-session-ubuntu-impish-4581

1. indicator-session-ubuntu-impish-4581
2. Dependent merge proposals