Merge proposals dependent on lp://staging/~phablet-team/messaging-app/tweak_changelog

lp://staging/~phablet-team/messaging-app/tweak_changelog has no merge proposals.