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

Change-Id: Ib9cb6eb0e5a1e1d3e913101d545f6fb9ea74ac71