Merge proposals dependent on lp://staging/~benny/clicompanion/fix-for-946817

lp://staging/~benny/clicompanion/fix-for-946817 has no merge proposals.