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

Change-Id: Idabcee47a634fe368a2be19e905ceb74000b41aa