am 09ecfc06: am cf0a94fa: merge in klp-release (no-op)

* commit '09ecfc06':
  Do not merge. Revert emoji key position to JB-mr2
  Fix: Native crash when an empty attribute is written. DO NOT MERGE
  Use reentrant lock for main dictionaries. DO NOT MERGE
  Stop reading dictionary while regenerating. (DO NOT MERGE)