Merge proposals dependent on lp://staging/~bdfhjk/clicompanion/fix-622063

lp://staging/~bdfhjk/clicompanion/fix-622063 has no merge proposals.