Merge proposals dependent on lp://staging/~ci-train-bot/indicator-keyboard/indicator-keyboard-ubuntu-eoan-3753

1. indicator-keyboard-ubuntu-eoan-3753
2. Dependent merge proposals