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

Change-Id: I71192d22d4856671ce53305c879c214b0ddfa0b3