Merge "Revert "Remove String version of getBadgedLabel"" into lmp-dev