Merge proposals dependent on lp://qastaging/~ci-train-bot/gallery-app/gallery-app-ubuntu-xenial-landing-002

1. gallery-app-ubuntu-xenial-landing-002
2. Dependent merge proposals