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

Change-Id: I0f56e373d1725e9d6e78fb62ae73b8fa72088a06