Merge "Fix some top-level settings not updating with language" into nyc-dev