Merge "Fix refresh issue of badged icons in Battery Settings" into lmp-dev