Merge "Account for text op stroke in bounds calculation" into nyc-dev