Merge proposals dependent on lp://qastaging/~ci-train-bot/ubuntu-touch-session/ubuntu-touch-session-ubuntu-zesty-2481

1. ubuntu-touch-session-ubuntu-zesty-2481
2. Dependent merge proposals