Merge change 1099 into donut

* changes:
  Fix Phone-based locale selection to never choose a lang-only locale.