Merge "Overflow labels: higher contrast" into rvc-dev am: 8f73970e57

Change-Id: If97b5d041621478990a92c5ce33ed7749d351047