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

Change-Id: I6c5e0a7c231fa61c3f7ce141d3ddab8ed168e262