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

* commit 'ed703565063107350970959d82ac63eb76b51d26':
  Fix some top-level settings not updating with language

Change-Id: I4f2f0295a73e115fdcc8eb76cc40854cc98e493c