Merge "Overflow labels: two lines with ellipsis" into rvc-dev am: 1d8cfc1312

Change-Id: I696082fa50251becb2ed75cb1f1ab91a3840b682