Merge "Layers were using an extra Snapshot causing extra clipping."