Merge change 25153 into eclair

* changes:
  Reconcile the character popups for the hard and soft keyboards.