Merge proposals dependent on lp://staging/~sune-keller/empathy/fix-533857

lp://staging/~sune-keller/empathy/fix-533857 has no merge proposals.