Merge commit 'dda648f00aa6ea7b12dc4b96e70a6ced3c422e4a' * commit 'dda648f00aa6ea7b12dc4b96e70a6ced3c422e4a': Reconcile the character popups for the hard and soft keyboards.
Merge commit 'dda648f00aa6ea7b12dc4b96e70a6ced3c422e4a' * commit 'dda648f00aa6ea7b12dc4b96e70a6ced3c422e4a': Reconcile the character popups for the hard and soft keyboards.