Merge "Use app's best locale if they override LocaleList" into nyc-dev