Merge "Work to support saveLayer in new pipeline"