Merge "Fix minimum line height for TextView use case" into main