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

Change-Id: I19c78c676674b85476458188461f4a8a92cde486