Merge "Fix gallery rearrange on resize with missing images"