Merge proposals dependent on lp://qastaging/~ci-train-bot/gallery-app/gallery-app-ubuntu-yakkety-2053

1. gallery-app-ubuntu-yakkety-2053
2. Dependent merge proposals