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

Change-Id: I43401aa079ae067e29007a1275088e5798831262