Merge "Revert "Fix leak in unclipped save layer""