Merge "Avoid getUserBadgeNoBackgroundResId if no badge" into rvc-dev