Merge "Reset transparent region when saving a surface" into nyc-dev