Merge "Fix thumbnail disalignment on curved paths" into nyc-dev