Merge proposals dependent on lp:~artmello/gallery-app/gallery-app-fix_build

lp:~artmello/gallery-app/gallery-app-fix_build has no merge proposals.