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

Change-Id: I4545c402277b006b806b4bb33fc6235bd3eaab73