Merge "Avoid getUserBadgeNoBackgroundResId if no badge" into rvc-dev am: 2f559add63

Change-Id: I703ba5f4dd669f4461aca1597763e4ba05336400