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

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