Merge "Prevent reallocation of Surface object in copyFrom"