Merge proposals dependent on lp://staging/~tiagosh/messaging-app/fix-1582630

lp://staging/~tiagosh/messaging-app/fix-1582630 has no merge proposals.