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