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