am 5086a970: am fe03a84b: Merge "Fix QS labels on language change" into mnc-dev

* commit '5086a970e786ac4629f5f275a5df25f6e24e1f61':
  Fix QS labels on language change