Merge proposals dependent on lp://qastaging/~bfiller/gallery-app/silo-17-fixes

lp://qastaging/~bfiller/gallery-app/silo-17-fixes has no merge proposals.