Merge "Use correct API for badging" into lmp-dev