Merge "Create a thread_local cache for textLocale" into mnc-dev