Merge "Revert "Make ellipsize retry if text doesn't fit""