am 6817946f: Merge change 25601 into eclair

Merge commit '6817946fd0a009a554f6c0aae1b6c608ebd531c5' into eclair-plus-aosp

* commit '6817946fd0a009a554f6c0aae1b6c608ebd531c5':
  Fix possible race condition when switching keyboards while there are pending messages.