Merge "Overflow labels: higher contrast" into rvc-dev