Merge "Add badge colors for dark theme" into rvc-dev am: 78a66d6c36 am: 3e2a0d2682

Change-Id: Ie58ef75269834b2b3cf8e81a98e2c1984b630b43