Merge proposals dependent on lp://qastaging/~bfiller/gallery-app/revert-1245

lp://qastaging/~bfiller/gallery-app/revert-1245 has no merge proposals.