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

Change-Id: I747ac741c926a01f307945df3caf0deea9ebe94e