Merge "Fix bug #3389545 android:ellipsize="end" doesn't work without using android:singleLine="true" which is deprecated"