* commit '84201f75fe6aae78899c790bd3ea104ef23d1f25': Revert "Revert "Remove String version of getBadgedLabel""