Merge proposals dependent on lp://qastaging/~allanlesage/ubuntu-autopilot-tests/pick-first-app-demo

1. pick-first-app-demo
2. Dependent merge proposals