Merge change I8a575e49 into eclair

* changes:
  Fix CustomLocale to work with soft keyboard.