Merge change 25299 into eclair

* changes:
  Show keyboard automatically in EditTextPreference dialogs