Merge "Don't overwrite vertical and horizontal offsets unless explicit" into nyc-dev