Merge proposals dependent on lp://qastaging/~artmello/camera-app/camera-app-integration_camera_gallery

1. camera-app-integration_camera_gallery
2. Dependent merge proposals