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

Change-Id: Idbfa34401279cc1fa1eb84e1645f62ed70933348