Merge "Revert "Fix for ellipsized text that has two lines at maximum.""