Merge "Optimize saveLayer() when the clip flag is set."