Merge "Fix width calculation of TextView" into main