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