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

Change-Id: Ic45d128c4d6e91239f37d229c47aa5f8a784c5af