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

Change-Id: I7ad6f0991a78cfba9bcd77383309acb70a6fe89a