am d8ba6abf: Merge "[DO NOT MERGE] Fix a bug where autoshift would be ignored...
am d8ba6abf: Merge "[DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji" into klp-dev
* commit 'd8ba6abf':
[DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji