Merge change Id4d04def into eclair

* changes:
  Fix a race that kept the locale picker from working under heavy CPU load.