Merge "Badge texts correctly for accessibility in Settings" into lmp-dev