Merge "Check lineHeight without cast" into udc-dev