Merge "Fix ugly text wrapping on non-english locales" into mnc-dev