Merge "Apply final crop during surface preservation" into nyc-dev