Merge "[Safer intents] Input method" into main