am a5628933: (-s ours) 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 'a5628933ffd59889c98d8aaf6317a05591e2c68e': [DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emojimain
commit
ab2c2cabd1