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

* commit 'fe03a84bc6d59e9b09029cfa8800bd9ef8d85d18':
  Fix QS labels on language change