am 6032dcf9: (-s ours) am a79431b4: am d8ba6abf: Merge "[DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji" into klp-dev
* commit '6032dcf9505f8c72abda465c7cc72cfa2a011372': [DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emojimain
commit
a5628933ff