Merge "Fix script-related parts of locale resource matching" into nyc-dev