am 1bd1cd19: Merge "Fix the auto-composer to support supplementary chars"

* commit '1bd1cd19c0bf1367a0355b1f46caa9979e976aca':
  Fix the auto-composer to support supplementary chars