Merge "Fix leak in unclipped save layer"