Merge "Avoid printing call stack for the app that doesn't add the LocaleConfig" into tm-dev