Merge "Fix 6238404: Changed deleteGallery and deleteTempGallery to use broadcasts"