Merge "Move localeScriptWasProvided to end of ResTable_config"