* commit '0a1fb150ace167ddc1b15997a1199be32ef5420d': Revert "Revert "Remove String version of getBadgedLabel""