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

Change-Id: I344d57b6ace676f599b0919890b9c0c035b062fd