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

1. gallery-app-disable_gallery_photo_component
2. Dependent merge proposals