Merge "Fix a translate issue with saveLayer" into nyc-dev