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

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