Merge change 25369 into eclair

* changes:
  Update the input method when the selection changes.