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

Change-Id: I63b955fe6f0139b670b85b78c275e6d220e8a8f1