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