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

Change-Id: I89db1ad21a7cd9e7d5d2745105e1033f314f7bfb