Merge proposals dependent on lp://qastaging/~bdfhjk/clicompanion/fix-951637

lp://qastaging/~bdfhjk/clicompanion/fix-951637 has no merge proposals.