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

Change-Id: Ib5acb8632581d05c9cec7435312223de060e550d