am 46742367: am 09ecfc06: am cf0a94fa: merge in klp-release (no-op)
* commit '46742367fbc484de6e0433eb9f5b5862c3f7d9cc': 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)main
commit
aaabce8d30