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

Change-Id: I9a39a3b21c1b12f2fb9b31c66e9321a49eec556f