Merge proposals dependent on lp:~boiko/messaging-app/fix_autopilot2

lp:~boiko/messaging-app/fix_autopilot2 has no merge proposals.